FolderStatusModel: only create a single QFileIconProvider object

otherwise the icons will end up being loaded from the system each time,
which on Windows takes quite long (I saw many calls to
`shell32.dll!SHDefExtractIcon` during profiling)

Signed-off-by: Jyrki Gadinger <nilsding@nilsding.org>

diff --git a/src/gui/folderstatusmodel.cpp b/src/gui/folderstatusmodel.cpp
index d67e6e747521e4e7334ab865246be381118942c4..d1211d7412c713a38d5234012986f0b92190c51f 100644 (file)
--- a/src/gui/folderstatusmodel.cpp
+++ b/src/gui/folderstatusmodel.cpp
@@ -21,7 +21,6 @@
 #include <account.h>
 #include <theme.h>
 
-#include <QFileIconProvider>
 #include <QVarLengthArray>
 #include <set>
 
@@ -194,7 +193,7 @@ QVariant FolderStatusModel::data(const QModelIndex &index, int role) const
             } else if (subfolderInfo._size > 0 && isAnyAncestorEncrypted(index)) {
                 return QIcon(QLatin1String(":/client/theme/lock-broken.svg"));
             }
-            return QFileIconProvider().icon(subfolderInfo._isExternal ? QFileIconProvider::Network : QFileIconProvider::Folder);
+            return _fileIconProvider.icon(subfolderInfo._isExternal ? QFileIconProvider::Network : QFileIconProvider::Folder);
         }
         case Qt::ForegroundRole:
             if (subfolderInfo._isUndecided || (subfolderInfo._isNonDecryptable && subfolderInfo._checked)) {

diff --git a/src/gui/folderstatusmodel.h b/src/gui/folderstatusmodel.h
index 96b7467d14ddc1110e88d79acfa666c80e1d96f9..7a776a64b8323e290ee1d2bbd71ca4caddec2e4f 100644 (file)
--- a/src/gui/folderstatusmodel.h
+++ b/src/gui/folderstatusmodel.h
@@ -21,6 +21,7 @@
 #include <QVector>
 #include <QElapsedTimer>
 #include <QPointer>
+#include <QFileIconProvider>
 
 class QNetworkReply;
 namespace OCC {
@@ -161,6 +162,8 @@ private:
      */
     QMap<QPersistentModelIndex, QElapsedTimer> _fetchingItems;
 
+    QFileIconProvider _fileIconProvider;
+
 signals:
     void dirtyChanged();